Vision: pick up fixes to GAPIC generator. (googleapis#6632)

Includes fixes from these PRs:

- googleapis/gapic-generator#2407
- googleapis/gapic-generator#2396

Includes changes to generated tests.

Closes googleapis#6475.

vision/google/cloud/vision_v1/gapic/image_annotator_client.py

@@ -81,7 +81,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=image_annotator_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -114,13 +114,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = image_annotator_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

vision/google/cloud/vision_v1/gapic/product_search_client.py

@@ -99,41 +99,41 @@ def location_path(cls, project, location):
         )
 
     @classmethod
-    def product_path(cls, project, location, product):
-        """Return a fully-qualified product string."""
+    def product_set_path(cls, project, location, product_set):
+        """Return a fully-qualified product_set string."""
         return google.api_core.path_template.expand(
-            'projects/{project}/locations/{location}/products/{product}',
+            'projects/{project}/locations/{location}/productSets/{product_set}',
             project=project,
             location=location,
-            product=product,
+            product_set=product_set,
         )
 
     @classmethod
-    def product_set_path(cls, project, location, product_set):
-        """Return a fully-qualified product_set string."""
+    def product_path(cls, project, location, product):
+        """Return a fully-qualified product string."""
         return google.api_core.path_template.expand(
-            'projects/{project}/locations/{location}/productSets/{product_set}',
+            'projects/{project}/locations/{location}/products/{product}',
             project=project,
             location=location,
-            product_set=product_set,
+            product=product,
         )
 
     @classmethod
-    def image_path(cls, project, location, product, image):
-        """Return a fully-qualified image string."""
+    def reference_image_path(cls, project, location, product, reference_image):
+        """Return a fully-qualified reference_image string."""
         return google.api_core.path_template.expand(
-            'projects/{project}/locations/{location}/products/{product}/referenceImages/{image}',
+            'projects/{project}/locations/{location}/products/{product}/referenceImages/{reference_image}',
             project=project,
             location=location,
             product=product,
-            image=image,
+            reference_image=reference_image,
         )
 
     def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=product_search_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -166,13 +166,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = product_search_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and
@@ -707,7 +714,7 @@ def get_reference_image(self,
             >>>
             >>> client = vision_v1.ProductSearchClient()
             >>>
-            >>> name = client.image_path('[PROJECT]', '[LOCATION]', '[PRODUCT]', '[IMAGE]')
+            >>> name = client.reference_image_path('[PROJECT]', '[LOCATION]', '[PRODUCT]', '[REFERENCE_IMAGE]')
             >>>
             >>> response = client.get_reference_image(name)
 
@@ -776,7 +783,7 @@ def delete_reference_image(self,
             >>>
             >>> client = vision_v1.ProductSearchClient()
             >>>
-            >>> name = client.image_path('[PROJECT]', '[LOCATION]', '[PRODUCT]', '[IMAGE]')
+            >>> name = client.reference_image_path('[PROJECT]', '[LOCATION]', '[PRODUCT]', '[REFERENCE_IMAGE]')
             >>>
             >>> client.delete_reference_image(name)
 
@@ -1228,8 +1235,8 @@ def delete_product_set(self,
                            timeout=google.api_core.gapic_v1.method.DEFAULT,
                            metadata=None):
         """
-        Permanently deletes a ProductSet. All Products and ReferenceImages in
-        the ProductSet will be deleted.
+        Permanently deletes a ProductSet. Products and ReferenceImages in the
+        ProductSet are not deleted.
 
         The actual image files are not deleted from Google Cloud Storage.
 

vision/google/cloud/vision_v1/gapic/transports/image_annotator_grpc_transport.py

@@ -66,6 +66,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -102,6 +104,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def batch_annotate_images(self):
         """Return the gRPC stub for {$apiMethod.name}.

vision/google/cloud/vision_v1/gapic/transports/product_search_grpc_transport.py

@@ -66,6 +66,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -102,6 +104,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def create_product(self):
         """Return the gRPC stub for {$apiMethod.name}.
@@ -375,8 +386,8 @@ def update_product_set(self):
     def delete_product_set(self):
         """Return the gRPC stub for {$apiMethod.name}.
 
-        Permanently deletes a ProductSet. All Products and ReferenceImages in
-        the ProductSet will be deleted.
+        Permanently deletes a ProductSet. Products and ReferenceImages in the
+        ProductSet are not deleted.
 
         The actual image files are not deleted from Google Cloud Storage.
 

vision/google/cloud/vision_v1/proto/product_search_service_pb2_grpc.py

@@ -188,8 +188,8 @@ def UpdateProductSet(self, request, context):
     raise NotImplementedError('Method not implemented!')
 
   def DeleteProductSet(self, request, context):
-    """Permanently deletes a ProductSet. All Products and ReferenceImages in the
-    ProductSet will be deleted.
+    """Permanently deletes a ProductSet. Products and ReferenceImages in the
+    ProductSet are not deleted.
 
     The actual image files are not deleted from Google Cloud Storage.
 

vision/google/cloud/vision_v1p1beta1/gapic/image_annotator_client.py

@@ -74,7 +74,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=image_annotator_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -107,13 +107,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = image_annotator_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

vision/google/cloud/vision_v1p1beta1/gapic/transports/image_annotator_grpc_transport.py

@@ -65,6 +65,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -95,6 +97,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def batch_annotate_images(self):
         """Return the gRPC stub for {$apiMethod.name}.

vision/google/cloud/vision_v1p2beta1/gapic/image_annotator_client.py

@@ -77,7 +77,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=image_annotator_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -110,13 +110,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = image_annotator_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

vision/google/cloud/vision_v1p2beta1/gapic/transports/image_annotator_grpc_transport.py

@@ -66,6 +66,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -102,6 +104,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def batch_annotate_images(self):
         """Return the gRPC stub for {$apiMethod.name}.

vision/google/cloud/vision_v1p3beta1/gapic/image_annotator_client.py

@@ -81,7 +81,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=image_annotator_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -114,13 +114,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = image_annotator_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and