fix(deps): Require google-api-core >=1.34.0, >=2.11.0 (#457)

* fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: googleapis/googleapis@fea4387 Source-Link: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add gapic_version.py Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>

Author: gcf-owl-bot[bot]

.coveragerc

@@ -10,8 +10,3 @@ exclude_lines =
  pragma: NO COVER
  # Ignore debug-only repr
  def __repr__
- # Ignore pkg_resources exceptions.
- # This is added at the module level as a safeguard for if someone
- # generates the code and tries to run it without pip installing. This
- # makes it virtually impossible to test properly.
- except pkg_resources.DistributionNotFound

google/cloud/automl_v1/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "2.8.3" # {x-release-please-version}

google/cloud/automl_v1/services/auto_ml/async_client.py

@@ -27,7 +27,8 @@
  Type,
  Union,
 )
-import pkg_resources
+
+from google.cloud.automl_v1 import gapic_version as package_version
 
 from google.api_core.client_options import ClientOptions
 from google.api_core import exceptions as core_exceptions
@@ -250,7 +251,7 @@ async def create_dataset(
  parent: Optional[str] = None,
  dataset: Optional[gca_dataset.Dataset] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Creates a dataset.
@@ -285,7 +286,7 @@ async def sample_create_dataset():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -378,7 +379,7 @@ async def get_dataset(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> dataset.Dataset:
  r"""Gets a dataset.
@@ -492,7 +493,7 @@ async def list_datasets(
  *,
  parent: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListDatasetsAsyncPager:
  r"""Lists datasets in a project.
@@ -618,7 +619,7 @@ async def update_dataset(
  dataset: Optional[gca_dataset.Dataset] = None,
  update_mask: Optional[field_mask_pb2.FieldMask] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> gca_dataset.Dataset:
  r"""Updates a dataset.
@@ -737,7 +738,7 @@ async def delete_dataset(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Deletes a dataset and all of its contents. Returns empty
@@ -771,7 +772,7 @@ async def sample_delete_dataset():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -876,7 +877,7 @@ async def import_data(
  name: Optional[str] = None,
  input_config: Optional[io.InputConfig] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Imports data into a dataset. For Tables this method can only be
@@ -919,7 +920,7 @@ async def sample_import_data():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -1025,7 +1026,7 @@ async def export_data(
  name: Optional[str] = None,
  output_config: Optional[io.OutputConfig] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Exports dataset's data to the provided output location. Returns
@@ -1062,7 +1063,7 @@ async def sample_export_data():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -1165,7 +1166,7 @@ async def get_annotation_spec(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> annotation_spec.AnnotationSpec:
  r"""Gets an annotation spec.
@@ -1276,7 +1277,7 @@ async def create_model(
  parent: Optional[str] = None,
  model: Optional[gca_model.Model] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Creates a model. Returns a Model in the
@@ -1310,7 +1311,7 @@ async def sample_create_model():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -1405,7 +1406,7 @@ async def get_model(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> model.Model:
  r"""Gets a model.
@@ -1515,7 +1516,7 @@ async def list_models(
  *,
  parent: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListModelsAsyncPager:
  r"""Lists models.
@@ -1640,7 +1641,7 @@ async def delete_model(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Deletes a model. Returns ``google.protobuf.Empty`` in the
@@ -1673,7 +1674,7 @@ async def sample_delete_model():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -1778,7 +1779,7 @@ async def update_model(
  model: Optional[gca_model.Model] = None,
  update_mask: Optional[field_mask_pb2.FieldMask] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> gca_model.Model:
  r"""Updates a model.
@@ -1890,7 +1891,7 @@ async def deploy_model(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Deploys a model. If a model is already deployed, deploying it
@@ -1933,7 +1934,7 @@ async def sample_deploy_model():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -2027,7 +2028,7 @@ async def undeploy_model(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Undeploys a model. If the model is not deployed this method has
@@ -2065,7 +2066,7 @@ async def sample_undeploy_model():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -2160,7 +2161,7 @@ async def export_model(
  name: Optional[str] = None,
  output_config: Optional[io.ModelExportOutputConfig] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Exports a trained, "export-able", model to a user specified
@@ -2201,7 +2202,7 @@ async def sample_export_model():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -2306,7 +2307,7 @@ async def get_model_evaluation(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> model_evaluation.ModelEvaluation:
  r"""Gets a model evaluation.
@@ -2417,7 +2418,7 @@ async def list_model_evaluations(
  parent: Optional[str] = None,
  filter: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListModelEvaluationsAsyncPager:
  r"""Lists model evaluations.
@@ -2567,14 +2568,9 @@ async def __aexit__(self, exc_type, exc, tb):
  await self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-automl",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("AutoMlAsyncClient",)