feat: add audience parameter (#455)

fix(deps): require google-api-core>=1.32.0,>=2.8.0

Author: parthea

google/cloud/vision_v1/services/image_annotator/client.py

@@ -453,6 +453,7 @@ def __init__(
  quota_project_id=client_options.quota_project_id,
  client_info=client_info,
  always_use_jwt_access=True,
+ api_audience=client_options.api_audience,
  )
 
  def batch_annotate_images(

google/cloud/vision_v1/services/image_annotator/transports/base.py

@@ -59,6 +59,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  **kwargs,
  ) -> None:
  """Instantiate the transport.
@@ -86,11 +87,6 @@ def __init__(
  be used for service account credentials.
  """
 
- # Save the hostname. Default to port 443 (HTTPS) if none is specified.
- if ":" not in host:
- host += ":443"
- self._host = host
-
  scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
  # Save the scopes.
@@ -111,6 +107,11 @@ def __init__(
  credentials, _ = google.auth.default(
  **scopes_kwargs, quota_project_id=quota_project_id
  )
+ # Don't apply audience if the credentials file passed from user.
+ if hasattr(credentials, "with_gdch_audience"):
+ credentials = credentials.with_gdch_audience(
+ api_audience if api_audience else host
+ )
 
  # If the credentials are service account credentials, then always try to use self signed JWT.
  if (
@@ -123,6 +124,11 @@ def __init__(
  # Save the credentials.
  self._credentials = credentials
 
+ # Save the hostname. Default to port 443 (HTTPS) if none is specified.
+ if ":" not in host:
+ host += ":443"
+ self._host = host
+
  def _prep_wrapped_messages(self, client_info):
  # Precompute the wrapped methods.
  self._wrapped_methods = {

google/cloud/vision_v1/services/image_annotator/transports/grpc.py

@@ -63,6 +63,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -159,6 +160,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

google/cloud/vision_v1/services/image_annotator/transports/grpc_asyncio.py

@@ -108,6 +108,7 @@ def __init__(
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -204,6 +205,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

google/cloud/vision_v1/services/product_search/client.py

@@ -495,6 +495,7 @@ def __init__(
  quota_project_id=client_options.quota_project_id,
  client_info=client_info,
  always_use_jwt_access=True,
+ api_audience=client_options.api_audience,
  )
 
  def create_product_set(

google/cloud/vision_v1/services/product_search/transports/base.py

@@ -60,6 +60,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  **kwargs,
  ) -> None:
  """Instantiate the transport.
@@ -87,11 +88,6 @@ def __init__(
  be used for service account credentials.
  """
 
- # Save the hostname. Default to port 443 (HTTPS) if none is specified.
- if ":" not in host:
- host += ":443"
- self._host = host
-
  scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
  # Save the scopes.
@@ -112,6 +108,11 @@ def __init__(
  credentials, _ = google.auth.default(
  **scopes_kwargs, quota_project_id=quota_project_id
  )
+ # Don't apply audience if the credentials file passed from user.
+ if hasattr(credentials, "with_gdch_audience"):
+ credentials = credentials.with_gdch_audience(
+ api_audience if api_audience else host
+ )
 
  # If the credentials are service account credentials, then always try to use self signed JWT.
  if (
@@ -124,6 +125,11 @@ def __init__(
  # Save the credentials.
  self._credentials = credentials
 
+ # Save the hostname. Default to port 443 (HTTPS) if none is specified.
+ if ":" not in host:
+ host += ":443"
+ self._host = host
+
  def _prep_wrapped_messages(self, client_info):
  # Precompute the wrapped methods.
  self._wrapped_methods = {

google/cloud/vision_v1/services/product_search/transports/grpc.py

@@ -78,6 +78,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -174,6 +175,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

google/cloud/vision_v1/services/product_search/transports/grpc_asyncio.py

@@ -123,6 +123,7 @@ def __init__(
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -219,6 +220,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

setup.py

@@ -22,10 +22,7 @@
 version = "2.7.3"
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
- # NOTE: Maintainers, please do not require google-api-core>=2.x.x
- # Until this issue is closed
- # https://github.com/googleapis/google-cloud-python/issues/10566
- "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
+ "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
  "proto-plus >= 1.15.0, <2.0.0dev",
  "protobuf >= 3.19.0, <4.0.0dev",
 ]